[WIPChanges to yaml files, deployment bicep script, and readme file. #247

francisnazareth · 2025-01-31T15:41:43Z

azuredeploy.bicep

Removing use of service principal (client ID and client secret) for AKS cluster creation. (managed identity is preferred)
Removing Kubernetes version parameter (as default version is used)
Removing storage account creation (as this storage account is not used by any of the microservices).
Adding resource group contributor role assignment to the managed identity
Removing Log analytics workspace creation (as a log analytics workspace is already created by the fabrikam workload bicep script).
Changing the script to take in the existing log analytics workspace's resource ID as a parameter and create the AKS cluster using the log analytics workspace resource ID.

charts/package/template/package-deploy.yaml

The package microservice needs App insights connection string. Hence adding this connection string as a secret in the deployment yaml file.

charts/package/templates/package-secret-provider.yaml
adding a new key and value for application insights connection string (this will be used in the deployment yaml file)

Readme file:
Changes for readability, document structure, and ease of deployment (as the previous documentation was too complex).

@ckittel

johndowns

Thanks @francisnazareth - a few requests here, some of them just for stylistic/consistency reasons, but also a few more important items.

johndowns · 2025-02-16T23:59:15Z

deployment.md

 ```

-## Deployment
+:book: This pre-flight Bicep template creates two resource groups. Additionally five User Identites are provisioned that will be later associated to every containerized microservice. This is because they will need Azure RBAC roles over the Azure KeyVault to read secrets in runtime. The resources will be created on the resouce group location and each resource group will contain the region as part of their names


Suggested change

:book: This pre-flight Bicep template creates two resource groups. Additionally five User Identites are provisioned that will be later associated to every containerized microservice. This is because they will need Azure RBAC roles over the Azure KeyVault to read secrets in runtime. The resources will be created on the resouce group location and each resource group will contain the region as part of their names

:book: This pre-flight Bicep file creates two resource groups. Additionally five User identities are provisioned that will be later associated to every containerized microservice. This is because they will need Azure RBAC roles over the Azure Key Vault to read secrets at runtime. The resources will be created in the resource group's location, and each resource group will contain the region name as part of its name.

johndowns · 2025-02-16T23:59:35Z

deployment.md


-export PREREQS_DEPLOYMENT_NAME=workload-stamp-prereqs-main
+### Assign ACR variables


Suggested change

### Assign ACR variables

### Assign Azure Container Registry variables

johndowns · 2025-02-17T00:00:00Z

deployment.md

-until az ad sp show --id $WORKFLOW_PRINCIPAL_ID &> /dev/null ; do echo "Waiting for Microsoft Entra ID propagation" && sleep 5; done
-until az ad sp show --id $PACKAGE_ID_PRINCIPAL_ID &> /dev/null ; do echo "Waiting for Microsoft Entra ID propagation" && sleep 5; done
-until az ad sp show --id $INGESTION_ID_PRINCIPAL_ID &> /dev/null ; do echo "Waiting for Microsoft Entra ID propagation" && sleep 5; done
+1. Build and push the Delivery service container image to ACR.


Suggested change

1. Build and push the Delivery service container image to ACR.

1. Build and push the Delivery service container image to the container registry.

Minor style nit, but could you please indent all of the code fences by four spaces, so they are indented underneath the corresponding step?

johndowns · 2025-02-17T00:00:08Z

deployment.md

-# Get outputs from workload deploy
-export ACR_NAME=$(az deployment group show -g rg-shipping-dronedelivery-${LOCATION} -n workload-stamp --query properties.outputs.acrName.value -o tsv)
-export ACR_SERVER=$(az acr show -n $ACR_NAME --query loginServer -o tsv)
+2. Build and push the Ingestion service container image to ACR.


Suggested change

2. Build and push the Ingestion service container image to ACR.

2. Build and push the Ingestion service container image to the container registry.

johndowns · 2025-02-17T00:00:16Z

deployment.md

 ```

-Deploy the managed cluster and all related resources (This step takes about 15 minutes)
+3. Build and push the Workflow service container image to ACR.


Suggested change

3. Build and push the Workflow service container image to ACR.

3. Build and push the Workflow service container image to the container registry.

johndowns · 2025-02-17T02:02:48Z

deployment.md

+## Deploy the managed cluster and related resources
+
+```bash
+


Suggested change

johndowns · 2025-02-17T02:10:06Z

deployment.md

+export LOG_ANALYTICS_WORKSPACE_ID=$(az deployment group show -g rg-shipping-dronedelivery-${LOCATION} -n workload-stamp --query properties.outputs.laWorkspace.value -o tsv)
+
+az deployment group create -g rg-shipping-dronedelivery-${LOCATION} --name managed-cluster-deployment  --template-file azuredeploy.bicep \
+--parameters deliveryIdName=uid-delivery \


For consistency could you please indent this line?

johndowns · 2025-02-17T02:11:07Z

deployment.md

-```bash
-export AKS_OIDC_ISSUER="$(az aks show -n $CLUSTER_NAME -g rg-shipping-dronedelivery-${LOCATION} --query "oidcIssuerProfile.issuerUrl" -otsv)"
-```
-
 ## Deploy the Delivery service

 Extract resource details from deployment.


Can you please remove this intruction, or update it to reflect what's actually happening? (There's a lot more than extracting resource details!)

Please do the same on each of the services below.

johndowns · 2025-02-17T02:19:49Z

deployment.md

@@ -254,7 +241,7 @@ helm install delivery-v0.1.0-dev delivery-v0.1.0.tgz \
     --set identity.tenantId=$TENANT_ID \
     --set keyVaultName=$DELIVERY_KEYVAULT_NAME \
     --set ingress.tls=true \
-     --set ingress.class=nginx \
+     --set ingress.class=webapprouting.kubernetes.azure.com \


FYI I ran these steps on macOS (v15.3) using the default zsh shell, and the glob patterns caused an issue. I had to change these lines:

--set ingress.hosts[0].name="$EXTERNAL_INGEST_FQDN" \ --set ingress.hosts[0].serviceName=delivery \ --set ingress.hosts[0].tls=true \ --set ingress.hosts[0].tlsSecretName=delivery-ingress-tls \

to:

--set ingress.hosts\[0\].name="$EXTERNAL_INGEST_FQDN" \ --set ingress.hosts\[0\].serviceName=delivery \ --set ingress.hosts\[0\].tls=true \ --set ingress.hosts\[0\].tlsSecretName=delivery-ingress-tls \

johndowns · 2025-02-17T02:38:45Z

deployment.md

+```
+kubectl get pods -n backend-dev --watch
+```
+
 ## Validate the application is running


When I first ran the curl request to the deliveryrequests API, I got a 503 response from nginx. I had verified the pods were running.

After a few minutes I was able to successfully reach it, so the problem was only temporary - but is there anything else to check for before running the validation steps?

francisnazareth added 30 commits January 27, 2025 09:47

adding app insights connection string as a kubernetes secret

b2c6325

Update package-deploy.yaml

62921ab

Update deployment.md

92c1088

Update deployment.md

9cba27d

Update deployment.md

ee49325

Update deployment.md

c734066

Update deployment.md

cbc5e33

Update deployment.md

b5bd9b0

Update deployment.md

f57bf3a

Update deployment.md

2247f75

Update deployment.md

06e7b22

Update deployment.md

41b126b

Update deployment.md

c1f92f3

Update azuredeploy.bicep

e7e26d3

Update deployment.md

182b9ca

Update deployment.md

05fcec7

Update deployment.md

16af31b

Update deployment.md

5d88112

Update deployment.md

c851e48

Update deployment.md

a0c94b3

Update deployment.md

8c80cca

Update deployment.md

029f8f7

Update azuredeploy.bicep - removing service principal.

5b3812d

Update deployment.md

535fa68

Update azuredeploy.bicep

34080d0

Update deployment.md

f740d1d

Update azuredeploy.bicep

a02ee19

Update azuredeploy.bicep - removing storage

2ba9c14

Update deployment.md

d513ac9

Update azuredeploy.bicep

b09139a

francisnazareth added 14 commits January 30, 2025 20:18

Update azuredeploy.bicep

ddeed20

Update azuredeploy.bicep

3b9f60c

Update azuredeploy.bicep

5c08d40

Update azuredeploy.bicep

1297193

Update azuredeploy.bicep

7027d64

Update deployment.md

def2364

Update deployment.md

6f7936e

Update deployment.md

2d136a7

Update deployment.md

b98c652

Update deployment.md

5f9d5ce

Update deployment.md

09bed7e

Update deployment.md

f3c7427

Update deployment.md

5edd080

Update deployment.md

e551654

francisnazareth changed the title ~~[WIPChanges to yaml files, deployment bicep script, and~~ [WIPChanges to yaml files, deployment bicep script, and readme file. Jan 31, 2025

johndowns requested changes Feb 17, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIPChanges to yaml files, deployment bicep script, and readme file. #247

[WIPChanges to yaml files, deployment bicep script, and readme file. #247

francisnazareth commented Jan 31, 2025 •

edited

Loading

johndowns left a comment

johndowns Feb 16, 2025

johndowns Feb 16, 2025

johndowns Feb 17, 2025

johndowns Feb 17, 2025

johndowns Feb 17, 2025

johndowns Feb 17, 2025

johndowns Feb 17, 2025

johndowns Feb 17, 2025

johndowns Feb 17, 2025

johndowns Feb 17, 2025

johndowns Feb 17, 2025


		export PREREQS_DEPLOYMENT_NAME=workload-stamp-prereqs-main
		### Assign ACR variables

	### Assign ACR variables
	### Assign Azure Container Registry variables

	1. Build and push the Delivery service container image to ACR.
	1. Build and push the Delivery service container image to the container registry.

	2. Build and push the Ingestion service container image to ACR.
	2. Build and push the Ingestion service container image to the container registry.

	3. Build and push the Workflow service container image to ACR.
	3. Build and push the Workflow service container image to the container registry.

[WIPChanges to yaml files, deployment bicep script, and readme file. #247

Are you sure you want to change the base?

[WIPChanges to yaml files, deployment bicep script, and readme file. #247

Conversation

francisnazareth commented Jan 31, 2025 • edited Loading

johndowns left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

francisnazareth commented Jan 31, 2025 •

edited

Loading